Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Thu, 22 Sep 2016 17:34:55 +0000 (13:34 -0400)
committerTom Rini <[email protected]>
Thu, 22 Sep 2016 17:34:55 +0000 (13:34 -0400)

Trivial merge